# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1046.327.17 -> 1.1046.327.18 # include/asm-alpha/hw_irq.h 1.3 -> 1.4 # include/linux/irq.h 1.8 -> 1.9 # include/asm-i386/hw_irq.h 1.22 -> 1.23 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/06/17 paulkf@microgate.com 1.1046.337.14 # [PATCH] syncppp fixes # # - Fix 'badness in local_bh_enable' warning # # This involved moving dev_queue_xmit() calls # outside of sections with spinlock held. # # - Fix 'fix old protocol handler' warning # # This includes accounting for shared skbs, # setting protocol .data field to non-null, # and adding per device synchronization to # receive handler. # # This has been tested in PPP and Cisco modes # with and with out the keepalives enabled # on a SMP machine. # -------------------------------------------- # 03/06/19 davidm@tiger.hpl.hp.com 1.1046.327.18 # Simplify the irq_desc[] patch to make it more acceptable for the # main tree. # -------------------------------------------- # diff -Nru a/include/asm-alpha/hw_irq.h b/include/asm-alpha/hw_irq.h --- a/include/asm-alpha/hw_irq.h Mon Sep 22 13:01:27 2003 +++ b/include/asm-alpha/hw_irq.h Mon Sep 22 13:01:27 2003 @@ -13,6 +13,4 @@ #define ACTUAL_NR_IRQS NR_IRQS #endif -extern irq_desc_t irq_desc [NR_IRQS]; - #endif diff -Nru a/include/asm-i386/hw_irq.h b/include/asm-i386/hw_irq.h --- a/include/asm-i386/hw_irq.h Mon Sep 22 13:01:27 2003 +++ b/include/asm-i386/hw_irq.h Mon Sep 22 13:01:27 2003 @@ -117,6 +117,4 @@ static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i) {} #endif -extern irq_desc_t irq_desc [NR_IRQS]; - #endif /* _ASM_HW_IRQ_H */ diff -Nru a/include/linux/irq.h b/include/linux/irq.h --- a/include/linux/irq.h Mon Sep 22 13:01:27 2003 +++ b/include/linux/irq.h Mon Sep 22 13:01:27 2003 @@ -66,6 +66,10 @@ spinlock_t lock; } ____cacheline_aligned irq_desc_t; +#ifndef CONFIG_IA64 +extern irq_desc_t irq_desc [NR_IRQS]; +#endif + #include /* the arch dependent stuff */ extern int handle_IRQ_event(unsigned int, struct pt_regs *, struct irqaction *);